From 269ae0f7c0aa496a91aa060a2c5b81ef04fc096f Mon Sep 17 00:00:00 2001 From: Steven Hand Date: Thu, 17 Aug 2006 20:30:05 +0100 Subject: [PATCH] Fix live migration w/ shadow2. Signed-off-by: Steven Hand --- xen/arch/x86/traps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 7a5d2f868a..b25fa9d05c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -890,8 +890,9 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) if ( VM_ASSIST(d, VMASST_TYPE_writable_pagetables) && guest_kernel_mode(v, regs) && - ((regs->error_code & (PGERR_write_access|PGERR_page_present)) == - (PGERR_write_access|PGERR_page_present)) && + /* Do not check if access-protection fault since the page may + legitimately be not present in shadow page tables */ + ((regs->error_code & PGERR_write_access) == PGERR_write_access) && ptwr_do_page_fault(d, addr, regs) ) return EXCRET_fault_fixed; -- 2.30.2